Bug 943524 - fix issues in holly caused by bug 805374, r=jaws