Revert more private method scope breaking changes from r7308. See #5108.

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