Workaround for #907.
Merge remote-tracking branch 'OliverLetterer/cfstream-race-condition' into denivip