Revert "Potential syncing workaround/fix, Pushed separately for focus."

This reverts commit d1b8a93239e397a42cfb90fcba26009dd43e1090.