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