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