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