FIX: overzealous clean up of imports#5828

tacaswell merged 1 commit intomatplotlib:mastermatplotlib/matplotlib:masterfrom

tacaswell:fix_overzealoustacaswell/matplotlib:fix_overzealousCopy head branch name to clipboard