This reverts commit 3a38b534d193b7ff768a19ff840adf219aad5778. Change-Id: Ifbcd5734760e1f6ae9552c68860ade69325f7a2b