(Without the transformations to std::move(...))

(cherry picked from commit f5b25083)