This reverts commit 75843331. Reason for revert: Breaks ASAN tests. Change-Id: Ia58cf361393f620ad30a3e3e05f37b758a060622