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