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