Fix pre-intial handling after restart.

This should close #956