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