This patch doesn't resolve the issue, but the one used in for v3.0.13 should, so I'll try that one instead.