Revert "Merge pull request #12769 from gtorodelvalle/contacts-bug-924903-custom-tag"

This reverts commit a2932738a6c05382e0f17284a3d24542439c9afe, reversing
changes made to 7f240f2da3178b275315790585396629dbe2d756.
Merge pull request #12776 from lightsofapollo/revert-

Revert "Merge pull request #12769 from gtorodelvalle/contacts-bug-924903...