Regression on REPO-1339: merge missed a revert in translations-psp1 - reverted code now restored again after re-integration

For REPO-1339 an initial set of changes was reverted (svn r553332) at some point and another solution was chosen.
Those initial changes were also merged into the translations-psp1 branch, however the revert of those changes was not.
As a consequence, with the re-integration of the translations-psp1 branch into master those initial changes now have 're-emerged' again.
The intended changes for REPO-1339 will need to be restored/recreated again.