Revert "Always follow the user's preferred contact display name format."

This reverts commit 05a30b024396a0e8f8db446d839b30e584df6037.