Refs #4038

Revert r30096 and use better precious variable names.