Eli, is it okay to push both of these to emacs-27? Alternatively, reverting both fixes to Bug#29799 in addition to the Bug#29866 fix works: