Bug 1097697 - Backout changeset 126811256577 to fix talos regression r=me