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