Remove the previous code which hardcoded options and didn't work for
linux-icc.

Reviewed-By: dt