Return setup scripts in the consistent state

Change-Id: I853f598ef348e339d9cf9522a94d019ac538b462