Bug: 33797688 This reverts commit 1cb8b08ae4. Change-Id: I322b550d65d48be4a99faf1790d138d26a996d7e
1cb8b08ae4