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