Soft revert with commit to mitigate crash