Bug 851349 - Possible fix for intermittent failures. r=paul