Bug1003321

* Cherry picked the change-set that seems to fix the issue in master.

r=kgrandon