Revert "Issue 6857: Remove workaround to return the return value."

This reverts commit dd09dcc904c12ec3240c9d337d6b332a4a8daf73.
Issue 6857: rewrap the unwrapped return value.