It still hits us. All updates are over on #8356. This reverts commit c68ed017. (cherry picked from commit efcb31fb)