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