Backing out bug 632290 due to more permanent failures.