Reverted autoloader changes that conflict with composer