Reverted back optimizations wronged by DAAL.