Yes I'm reasonably confident that this fixes it. We will now figure out what went wrong with that PR.