Unbreak OpenCV