Cherry-pick r266868 from upstream.