Comment by esafak

Just do it in a follow up PR to keep them atomic. But do clean up; it's so easy now.