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