Revert some cv modifications