This is a fix for 9700, which we already fixed in 0.2.5.x, but which got left in 0.2.4.x. This is a partial backport of a0a855d586
a0a855d586