Bug 848916 - back out new strings for just 1.0.1 to keep string freeze

We should try hard to not take the strings in bug 848916 for 1.0.1.
Doing this by disabling the calls to displayError, and then remove the strings again.

This PR is for 1.0.1 only, the new strings should stay on master and v1-train.