This seems to have been broken at some point, restored.
This will create a new commit in order to revert the existing changes.
