Reverting more whitespace changes.