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