Back out bug 874353, which is suspected of causing bug 1046956. r=me a=backout