Revert functor performance changes as it breaks OpenMP.