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