Salesforce synchronization R2 changes

We need to figure out an ideal solution for this, let's put that on the list for next time.