It's the same as in #6964 since it's the most likely cause of the bug and that change hasn't been released yet.