Backport to stretch.
