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