This reverts commit 1d36dd7596 as this is an insufficient fix for the critical correctness bug.
Change-Id: Id48fec6e2146ccc98edb39629d9944404a17ba8c
This reverts commit 1d36dd7596 as this is an insufficient fix for the critical correctness bug.
Change-Id: Id48fec6e2146ccc98edb39629d9944404a17ba8c