Restored old code for older Emacs versions.  Made it conditional.