This reverts commit 05b3c933b34e9cec9eb859a15392862918b3eb5f. Change-Id: I07dd701ca911cd12701519d2e6d624c69baa0848