Update to elephant-bird 4.4