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