Hack around Emacs bug 16121

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16121