Commit a953b647507fe2ae8f5187fbfb04e69d2a2952e4

Behdad Esfahbod 2018-11-10T20:10:03

Revert parts of previous commit that made clang unhappy