more 21.x breakage