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