Moving to Emacs 24.4, and 24.4 only