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