Cherry-pick bb25e97 (fixed line numbers in requests patch)