Bug 904085 - Fixed bug from previous related commit r=gregor