This reverts commit 576a847e03. Fixes: 35701500 Change-Id: I972c2d0e56d365d1fad76a66e74bfad227bf26c4
576a847e03