Revert "Attempt deploying Justin Campbell's way"

This reverts commit 6729faddd727bbfcb45f66b84febd1721ee940d0.