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