backport another post-release bugfix