Rollback to using the correct initial setup