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