A first attempt to solve #398 (closed)
This will create a new commit in order to revert the existing changes.
