Fixes: 143334366 Test: manual This reverts commit a8570405. Change-Id: Ia5b5302a659f073cff6ab557bd70bfdbb070d86d