Include modifications suggested in #3051

refs #2490