Revert r8433

see #5652

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