Revert "We should set the span class here by default, saves duplicating the Span HTML"

This reverts commit 0239554e8ca43b84d47845062c50d70962358332.