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