Issue 6857: Remove workaround to return the return value.