KAZOO-2916: Revert a change