AFAIK, we are not yet ready to release emacs-24, so it'd be better to find a fix than revert.