CBIT-532:  restore goflags to original value

Change-Id: Ia37b9c7c0a30dec323497981b417bee02d31eae5