am d13b23a4: Merge "Revert "fix potential memory leak""

* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"