SPEED-21 Fix: remove the tag