refs #7529 fixing wrong merge