MDL-46763: Remove tag code that shouldn't be there