Reverting this commit fixes this bug.

http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f4b50dad8d5eade04f495c693c0bca46060b25cb
-- 

Kaushal Modi