This was apparently fixed by #10082.