Reopen code

Change-Id: I71814540c1f16836897e339a3d2035d1d772cf90