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