Stack from ghstack (oldest at bottom):
Our prettier setup is all messed up after the merge, so this PR should fix things