Move restore to previous callback