Revert the span class changes from a prior commit.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>