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