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