o Fix refactor code loss. Closes #7412.