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