Revert changes in multi_span to avoid a merge conflict, since this file was deleted in a parallel PR
Expects1 and