Revert "Pre-changes to CargoBay"

This reverts commit aa879dfc362418ddc478c5eefb5c865df3987854.