Backed out changeset ac74a1815c66 for failing intermittently after landing as a 'no bug' \o/