refs #6855 reverting erroneous merge results