Revert "Mega-Commit #10"

This reverts commit af62f5d729d8b34423c04c7c4d8fce550c88f682.