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