Root a forgotten tuple

(cherry picked from commit 0840a0e2a177e3a9f793535988d8295d89f1af4f)
(cherry picked from commit 75cff0337de1aa287671cf72633e92b0a5f63035)
(cherry picked from commit 36e11eda1aac918f76711e65e16ae70b08e9ce55)

Backport of #8819