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