Remove the Emacs 20.3-related kluge (and test whether I understand