Revert "Merge branch 'Add-contact'"

This reverts commit b11a7f0e671f6f22a792be7b5d309f811f66d46f, reversing
changes made to 22bcbf35f2eb1ddc5f81897a10703a8ccfeecc4b.