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