Revert "Don't wait twice for mongo"

This reverts commit 0cd23198209cc1bffbae00a18c4516e1458efed4.
Revert "Move mongo restart"

This reverts commit b37038cef37be984ed8a03323684c759d17d1f6c.
Change docs