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