Revert "Revert "Revert "Will be reverted"""

This reverts commit 02a01036859d0aede47edf9c171da97ae5b5a9b7.
Revert "Revert "Revert "Pre-changes to CargoBay"""

This reverts commit 0f66279ced03a7bb73c6996f8f0aebc034fb22f5.