This reverts commit 8777940f499a4a37fdb7c118de50f39cfa62f34b. The master branch is not yet affected by the string freeze.