Revert r7097. Will reopen #4857 and leave detailed feedback asap.

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