Backed out changesets e85722c30be3 and 28714f577de0 (bug 1097419) for B2G timeouts.