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

* commit '073bd90912b7060139f58ad4014384bfb30b72a3':
  Revert "Tentative fix for build breakage with read barriers."