Thanks for tracking this down. It's worth a note in etc/PROBLEMS; I installed 
the attached into the emacs-26 branch.