See: re6stnet!45 (merged)
/cc @jm @tomo
This will create a new commit in order to revert the existing changes.
