This is actually fixed by 870879 / bocoup/gaia#7