Revert previous commit

Moving work to bbp_trac_2414