Downgrade class loader to match 2.2