Revert "Recovery after Google Drive Glitch"

This reverts commit c5f78521f15ffa596d2eacc46d25b08d4786073c.
Revert "Revert "Recovery after Google Drive Glitch""

This reverts commit b6ea610d9fd1e72912f7f7394451288a2821f485.
Revert "Recovery after Google Drive Glitch"

This reverts commit c5f78521f15ffa596d2eacc46d25b08d4786073c.
Revert "Revert "Recovery after Google Drive Glitch""

This reverts commit 8f1ddc95b4ce7911e2f1c2d4e2ada5370b44b7b2.