Merge "Revert "fix potential memory leak""