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