This reverts commit 4ef56601b5 as this is an insufficient fix for the critical correctness bug.
Change-Id: I7885c437ce4df25002d92654312b3b1bae53bfa3
This reverts commit 4ef56601b5 as this is an insufficient fix for the critical correctness bug.
Change-Id: I7885c437ce4df25002d92654312b3b1bae53bfa3