Fix Issue #2598, or at least the scattered autoload files