Replace save and restore calls with an inverse translate
Merge branch 'ticket-144'