This reverts commit dc072507. Fixes: 294593868 Test: switcher users in user bouncer. Change-Id: Ie2b830d09a45e5dd95015749bd4631ff00994993