This reverts commit a2189bcb2e as this is the root cause of the critical correctness bug.
Change-Id: Ic85d3d670dc9488d49f03988fe42feb0cf0e7084
This reverts commit a2189bcb2e as this is the root cause of the critical correctness bug.
Change-Id: Ic85d3d670dc9488d49f03988fe42feb0cf0e7084