and several small fixes or changes to make this easier
This will create a new commit in order to revert the existing changes.
