This reverts commit a6c38be150. Fixes: 193333562 Test: manual Change-Id: I4fae079e0cd056fc800e5a15389f4795c77e17fb
a6c38be150