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