Revert translation commits that came by way of master

rel_2_1 is in security fix mode. No one should be adopting rel_2_1 at
this point. The drift between master and rel_2_1 is significant and
changes backported from master are likely to do more harm than good.

Signed-off-by: Dan Scott <dscott@laurentian.ca>