We would like to keep the opencv2 headers. We don't use the legacy opencv1.3 headers any more. Please revert.