Revert "First Go"

This reverts commit 86b047847ba1f24d5d382c057e9c9dbe8023fbc6.