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