CFY-799 revert oops commit