Sigh - looks like I did too good a job of turning things off. Back some of it out in favor of trying again when more time is available

Refs #4368