Roll in fixed up OCLProvider placeholder code