Bug 970455: backout cset afaeb5adc044 (Bug 956474), a=Ms2ger