Backed out changeset 4f2748dbe5ed (bug 684722) for Android timeouts.