Backout 3b91d62ca343 and 662d0cd47316 for test failures