This reverts commit f85c84db37 as this is the root cause for the critical correctness bug.
Change-Id: If71516db54138201039473485fb3cf7b5f49ccb0
This reverts commit f85c84db37 as this is the root cause for the critical correctness bug.
Change-Id: If71516db54138201039473485fb3cf7b5f49ccb0