This reverts commit e93505f5. This isn't the right thing to do, actually. Bug: 22871329 Change-Id: I0a0a5a86c7c8d8afdf417444ca7d73e56e040515