This reverts commit e387c8c413. The TestErrorMessages.test is failing on the Linux bots.
e387c8c413
d47ee525f9