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