r20796: Fix the same problem Jeremy has fixed (improper handling of deferred opens)