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

--HG--
extra : rebase_source : 9b73017ec9e4ef05b9e452f667b2bfe27232e1dd