Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."

This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.