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