fixed all lost data/lost bootstrap though

While playing with branching I managed to lose some data and all my
bootstrap progress.