Following up to:

http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00593.html

Does the attached patch fix things for you?  It's relative to Emacs 
trunk bzr 116586.