This reverts commit 79f14d202db14504f73f0bfc9343a57a57ed11a1. Change-Id: I24b69e311cb2d12abbc7dbfd0bf906a744fb2987