Better fix for CHOP-223.

Comments on the mercurial bug tracker indicate that this bug is likely to
recur, so we work around it in viewer_manifest.py now.
http://mercurial.selenic.com/bts/issue1802