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