Remove dependency on distribute.

Change-Id: Id22f552dd67048b7f5b1f36d01dfe643e0a31e60