Try to fix the intermittent failures described in Bug 1072225