CFY-121 revert changes