Revert the changes on error text message.

The old version works better for us because we can externalize the error
text.