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