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