Revert unintended whitespace changes from r77922