one more to cherry-pick

(cherry picked from commit 934d7fe)