refs #610 fix commit after reverting 4781