Reverting r8583 as it causes fatal errors when switching themes.

Fixes #5776


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