Revert 97f340a..6d58bc5

This rolls back to commit 97f340a0071ad1b4c90615f12c095e540f630bc7.
opencv framework replaced