Revert "span"

This reverts commit 0907c61f02d2b22f09e138f3a26c9dbb7a0c9ced.