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