Revert "Revert "Fix GenericSetup location". This commit seems to have broken the 5.0 build."

This reverts commit cee5ce1afc6e3e79becd2c8c1066d293814fc9d2.