KAZOO-1234: keep the payloads consistent