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