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