Revert 58e4a40..e3c7fbf

This rolls back to commit 58e4a40b3b543ca4f082466b5f27f6003d30fe2e.
Big Old Commit

Done