This reverts commit b32701bc5404ae37cfa01429962588b833913d7d. That fix has been included upstream in 246.5.