Backout Bug 902481 to fix crashes, r=me