Backed out changeset aed1b2464613
Backout more package.mk changes
Backout more package.mk changes