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