Revert "Tentative fix for build breakage with read barriers." This reverts commit 448f21e2c1cb43b193736598719979ebd2aed0b0. Change-Id: Id821effa06697b1464581bcd9c8f34cd0ea69896