Revert "Various changes"

Reverts Tundra-Python/AppetEYES#68