Revert 40f5a93 and instead add a test for icc.