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