Revert unneeded changes to setup module