revert part of previous commit

some of those were not real package names

Change-Id: I3f4aa340d3ba55f568c1f2c445da1e0fad489cb7