Revert "cv3"

This reverts commit d5d0ca88c8176bb9c4aac9dfae716e37d249f4f4.