Revert 99b5415568, it breaks Emacs 24.3.