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