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