Patch recent PlannerTestCase strangeness.