The fix in a416af51a4 was not enough by itself and that needs to be applied comprehensively. (cherry picked from commit 047d0314aa)
a416af51a4
047d0314aa