Save Skip mode

Revert back to old behavior.