I thought this was already merged to master, but apparently not.
This will create a new commit in order to revert the existing changes.
