Backport !1444 (merged) to 4-x-stable trees, so that we can get releases working again.
4-x-stable
See