Found during investigation of failure of skink buildfarm member and its
valgrind report.

Backpatch to all supported branches