See #2635 (closed) and #3032 (closed).
This will create a new commit in order to revert the existing changes.
