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

This reverts commit ff7ddffd219062af90ca83c43adbd02378091cbd.