Revert 40f5a93 and instead add a test for icc.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Revert 40f5a93 and instead add a test for icc.