This is mostly to fix a test, but I think the update for new setups are ok.
This will create a new commit in order to revert the existing changes.
