Revert "remove friends from edit friends"

This reverts commit e6cf43ea15ea82b5042089ba33dcfdb0a478eb72.
Revert 0550164..83b322c

This rolls back to commit 0550164024a1d85179f8157d88c1c9eb1e8653d4.