Backed out changeset 1b661c1ac582

This changeset, while fine on the surface, changes the buildslave environment in ways
that break jobs.