Revert "Treat everyone the same."

This reverts commit 7678aeddd9ca894d5acddef6f900d9d43af009ce.

Bug: 30051184, 29746499
Change-Id: Ibd8bc2771d67c4db61c82dcc8a569eb8adfef8de
1 file changed