Change as many commands as possible to not go fatal if encountered
during the forward phase of rollback

asdf

Revert "asdf"

This reverts commit c8cc434aa52701fff5b49c531db4c3c5f410a023.