This reverts commit a2af2b0c. Reason for revert: Seems to cause the asan gtests to fail. Change-Id: I0c7b4720de16f9b2b4e1e27c3c4e57a018c59a0c Test: none