Revert "Track ContactsProvider from CM"

This reverts commit 92640264455e6b295bc08aec296b06aa5e862e16.