Reworks the translation according to #73