Work around read/close race (x2)
#26714

matthewd wants to merge matthewd:close-race into rails:master

We do not currently have an analysis of these two commits