Revert last commit; fixed on emacs-24 branch instead.