Merge "Revert "BUG 4624: Use default domain when credentials dont provide one""