temporarily reverted autoload change