This reverts commit bcbfceb716. Related-Bug: #1463478 Change-Id: I37055c4a85ad747de9b177fb0d12f48edc2d63f5
bcbfceb716