FIX: Revert OpenCL changes