This code seems to have broken with Emacs 27.  Let's replace
the code with a hack for now so as that it would work.