This reverts merge request !462 (merged)
This will create a new commit in order to revert the existing changes.
