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