refs #4579 refactoring