Tests passing locally thus safe to merge/
This will create a new commit in order to revert the existing changes.
