Backout of 7cb26c341a4e due to new TPS sync failures