Backout 18f20fd92f8c (bug 826042) for talos failures