Revert "Recovery after Google Drive Glitch"

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

This reverts commit c9f4667a4f51bf9d20eeae1701d0d176cb6f86b1.