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