wrap that in one big if statement
code cleanup

no need no () your ifs
Merge branch 'bug/14235_googlepresync'