Adding the tag is the problem, since we're not going to have one to add once the old UI goes away.