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