This reverts commit 9e95d2c6. Reason for revert: The follow-up fix is not enough, reverting both CL. Change-Id: I929c05757a8ef8db439a5eb77f7ef2e20def701b