Delay remaining span_bugs in drop elaboration
#92207
+89
−8
Merged