#396 Removed autoloader hack