looks like a bad merge
Revert "fix restore derp"

This reverts commit 8433a2a1b9b0da4dabcb03aa607f8c4a24d443f3.
other part of bad merge

Revert "fix google account restore sync"

This reverts commit 1ac1c036c13e34592257adf02d4eddba09b5d21d.
fixed my bad cherrypick.
it was done by Jean Francis Dominique S. Mabalo for simple aosp but would not allow me to cherrypick his original commit properly