Merge "Tentative fix for build breakage with read barriers."