Merge "Revert "Tentative fix for build breakage with read barriers.""
am: 4344e11

* commit '4344e11598b3079032773ad7e381658f39bed92e':
  Revert "Tentative fix for build breakage with read barriers."