Remove reliance on old_fixture_equivalent