Revert "Merge branch '1.3.3-without_gettext' into 1.3.3"

This reverts commit 67671dc097d20e3db59599bc879039d9003b28bc, reversing
changes made to 7b3231e1fd73d317974f53a1e0d4519157f1004a.