Bug 939283: Revert "Merge pull request #13593 from wanderview/contacts-group-overflow"

This reverts commit 5b14442e76b6a03255ed7b94185378f983704f79, reversing
changes made to 31e549b4b672cf6491cbf73da8039873d618c798.