This issue was addressed in master by commit 6a837e5121, which has not
been cherry-picked into v9_10_sub.