merged
mentioned in commit de74d060
This will create a new commit in order to revert the existing changes.