Revert "Changes of opencv"

This reverts commit 91a973a974b07fb059c839ff950e83d44ee95158.
Revert 53e9684..bdcc33b

This rolls back to commit 53e9684e2aea10061175e78474b7dd51bde9255a.