Revert "Temp fix for sync issues"

This reverts commit ba5b33463e78430e16964bd9968322e16a728ab3.