Cludge to work with current state of develop. Refs #970