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