Revert "MDL-33117 Whitespace fixes"