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