Attempt to fix opencv by working around DATASET-931