First pass at fixing 2529
Change some code so I know where to start
Revert previous commit

Moving work to bbp_trac_2414