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