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