Fixes #4 (closed)
ping @andre.anjos @mguenther
This will create a new commit in order to revert the existing changes.
