Fix restart and nesting alt

Closes #1257.

@rocallahan I cherry-picked your test.  Thanks!