Fixed Bad Merge

Missed a change due to a previous merge that wiped out all of my changes
from a previous check-in.