Revert "Unpend + pass friends spec"

This reverts commit c09e0cc9281aec1a1b6650733794f9e02f18284c.