It would be nice to have this merged for v1.8
This will create a new commit in order to revert the existing changes.
