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