although it's possible that doing it as two commits in one PR would be fine.