WIP back to the begining, refs #6243