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