refs #904, fix bad merge from 92a110c7b9526f3bdff6ab2d26ebfae34cd32a9c