Patch recent PlannerTestCase strangeness.
(cherry picked from commit fa39a52c43ae1f693a5b6cacfc45a75cad0b26e9)