Reopen code

Change-Id: Ifb4f4d3c1f91e5c8c7e73e41ae1fae1f14a72593