This partially reverts commit c270defab7 from PR #166335. The tests worked after curl fix (commit 0fad2b34c4 from PR #167993).
c270defab7
0fad2b34c4