Revert "Fix up ContactsProvider"

This reverts commit 4299cd0a12e0e04432983bd5ed232d8b8320588a.