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