This fixes #7906.  The fixture class now totally works.