One change after applying to emacs-24 bzr branch