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