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