Go back to returning nil
for cancelled requests
#3024
+4
−9
Merged