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