am f7bf29c8: When un-natting try to do all we can

* commit 'f7bf29c8a37d65e132a4dceb7c5a4200ed5c3d79':
  When un-natting try to do all we can