#50 Remove CPU_INTENSIVE_THREADS hack for easy branch switching