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