[No review required] Put back some whitespace errors to fix up some merge conflicts