Revert "Bug 906756 - Algorithms for merging givenName and familyName changed."

This reverts commit 9e737ce855b02ab60a9ab8b87f6a1d6ffa1a191c.