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