Drop the setup-helper, it's cleaner.