This reverts commit d2b8105f. Reason for revert: may have problem under race condition Change-Id: I170bef11948e6d079ce04f5520088ee97a18a133