72fc79a
safer approach, please report any returning issue (cherry picked from commit 337de2b61e)
337de2b61e