This reverts commit 98e23164. Reason for revert: may have problem under race condition Change-Id: I2ced8b1a78e107f107b63468c5d8e4d62faa143c