Restore heapminfree to non-dicked-with values

Change-Id: I6d0647c01e1d65d8b4fe25517f6395788a27d7bb