KAZOO-2667: revert 223f334a