CFY-1511 revert impl