Revert and adapt to work with the next steps
refs #790