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