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