CRAY - Fix to handle a normal (non-clean) startup.