Bug 928678 - Hopeful fix for intermittent failure. r=jmaher, a=test-only