Backout 96eaa0f376ab (bug 961282) for smoketest regression.