Backport a fix applied to unstable-jumbo.