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