[3.1.0] Fix broken autoloader, resulting in duplicate classes