Reopen code for 6.1

Change-Id: I7d2374f715ce785360f43afc7eef7294ee59a471