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