Refs #4151, fix regression caused by refactoring hack.