Revert "Fixed bugs that were made by fixing bugs that were from cool things"

This reverts commit 55822789b9b2a36d79553d091f6efcb2831b93c8.