Merge pull request #1900 from soby-mathew/sm/revert_xlat_changes