refs #5588; refactoring