... and since the patch has just being pushed upstream, we may end up resolving (hopefully) this issue for free