Commit 3ee96984f4633852736b33640c89d1706bc77e0b

Behdad Esfahbod 2018-09-27T17:20:26

Fixup atomics from recent change