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