Backing out bug 961867 for causing an intermittent test failure.