KAZOO-908: accept upstream patch