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