No need to remove PACKAGESITE anymore.