fiddles there is a good chance that you can run setup without using the /TenantOrganizationConfig switch (since it's no longer needed from a technical perspective and we plan to remove the switch in the future).
However, there is a low probability that setup will ask you to provide the configuration file when running setup and passing the /PrepareAD switch (even if it's technically not required).
What you can do is:
Run setup with /PrepareAD and without the /TenantOrganizationConfig parameter and if it doesn't prompt you with an error, you are good. If it does, just re-run setup with /PrepareAD but this time, provide the /TenantOrganizationConfig parameter.
or
Run setup with /PrepareAD and with /TenantOrganizationConfig to be on the safe side.