Attemp no. 2 to fix IC2 API issues.