If you leave it as a separate commit within this PR, it's still easy to revert.