am 2d01066d: Merge "Dissociate uses with environment uses."

* commit '2d01066db24c19f9384f50ff71806cbb4835c7f9':
  Dissociate uses with environment uses.