Revert the changes to the error thrown.
Merge bug25928 again