Revert "Added Contacts to Client"

This reverts commit 2ac6028c26d54845fb90fa499ae2a1b1347059f8.
Revert "Revert to 2ac6028c26d54845fb90fa499ae2a1b1347059f8"

This reverts commit 81a95f5a35951c801378292863a52f7ae3820b09.