Revert setup until it works