Manually apply PR: Can be removed after >=2.13.2 is released.