This is good enough for now - release it so I can merge 1.19.