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