This reverts commit 03627aa84d.
03627aa84d
Closes #7958
Part of #7481 (effort to improve error messages) Closes #7559