Bug 831404 - More attempts to fix intermittent failure; r=orange