Revert "Merge pull request #11915 from reubenmorais/contacts-customizati...

...on"

This reverts commit 84e2d96144ce9e94cc1bd2f8da6a1d2f97c39181, reversing
changes made to 9cb0bf07dd6b8c23ee4c4db3d866464077f81e45.