Reverted several places in Setup.c