Revert 60a3283, but don't run main() on import