Backout b0eaf0e9fa9c (bug 971651) for M3 failures