If you leave it as 2 commits, I'll cherry-pick before squashing.