Bring back impersonator tag.
Merge bug 26098
stable to default