Revert r8600 for now, likely until roles and caps get themselves a nice overhaul. See #5749.

git-svn-id: https://buddypress.svn.wordpress.org/trunk@8601 cdf35c40-ae34-48e0-9cc9-0c9da1808c22