Fixed on the emacs-25 branch.