This reverts commit e72e340faa.
e72e340faa
PLEASE DO NOT BUILD PACKAGES BASES ON THIS Packages may still be renamed