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