Still don't work with groups, manually added everyone. This reverts commit 49085c39. Test: none Change-Id: I4c74fd87e333e80a2f3f7e4ef46ae6d56dfe832c