Revert wrong fixes for -icount in the iothread case