5.6 - removing extra save/restore.