Multicore compilation still doesn't work, put back the workaround.