Partially reverting (and amending) "Fixing parcelports:"

This (partially) reverts commit fbb9ac0de4886ad892631ec455e40643a3e1576e.