This reverts commit 4aaaef5967. Conflicts: modules/imgproc/include/opencv2/imgproc/types_c.h modules/legacy/include/opencv2/legacy/legacy.hpp
4aaaef5967