This reverts commit 07c12804, reversing changes made to d26ea880. Bug: 144619932 Test: Manual Change-Id: Ie9a46c9527004759a250dc71d2a1065ff3bb7328