This reverts commit a4231933.
It was not the correct fix for the mentioned bug and broke translations
@mart