Bug 886295. Backout fix for bug 880854 to fix regression. r=mats

--HG--
extra : rebase_source : 66bc089c3ece4dbe4f6533fce97a902abdd4871a