Really unbreak OpenCV