Backout f118b840cabe, 8f90c8059733, d440fa8a1568 because bug 946074 breaks a test