After submitting that patch, I realized that there was a much better way to do it that didn’t involve the hackiness. Check out the second patch on that trac ticket, and add the following line to wp-config.php: define( 'BP_DISABLE_AUTO_GROUP_JOIN', true );
