Use original uid

Refs #1563