This reverts commit 1f1d5018. This patch caused several sanitizer tests failed. Revert it to unblock others.