Backout 6de71ba24d50 (bug 922835) because it was the wrong version of the patch. r=me