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