start rebuildSession earlier in the process