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