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