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