I rolled the commit back as I got emacs 24.3 working. Hooray.