Backed out changeset a9b2fb2a349e and 6e5c90253058