Removed __autoload to avoid customer-reported conflicts