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