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