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