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