This partial reverts commit 35095c89b3a848a7f1029e89648c66341397c37c. Change-Id: Ibe2fa186b00817daf69bfdf1a3899bb291d308d0