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