Remove dependency on distribute

Change-Id: Iccd5834a675c4beea147a6765b686ce6f21e4ed1