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