Bug 1096026 - Fix bug 1096026, r=terrence, a=lmandel.