BUG 691881: Removed outdated cv code and replaced with CV2 code.