Backout 070f36bc24b6 for failures after chunking