Attempt to fix autoloading, refs #1829.