considering this is just affecting *our* test code, and we are still in milestones, I wonder if we should be more aggressive and simply remove this method and replace all of those calls?