pre-0.64 upstream for kitty