Backed out changeset 6c1cf4694a13 for not building on windows and android