Backout of erroneous change from bug 903284 r=Ms2ger