Revert "Outsourcing"

This reverts commit 45271c8e104b31b925d2990ac92993bebebbccc0.
Outsourcing Attempt 2