EUCA-7733 experiment
Undo the span selector - it broke a lot of things.