Thanks Collin Anderson for the report. Backport of a1be7237ca from master
a1be7237ca
request_finished