If this revert goes in I'll clang-format the other CL I have to restore the old one. But I don't think a revert should include formatting changes. This was messy enough to revert as was.

View Change

To view, visit change 42238. To unsubscribe, or for help writing mail filters, visit settings.