This shouldn't be necessary since we can assume autoload