PR fixup: move `strip` back to `save` from `validate`