Revert the 'Emergency Emacs 23 fixes'