@born: Can you check this before i merge it into master?
This will create a new commit in order to revert the existing changes.
