Revert "Resync"

This reverts commit 0be6dbaf2cc8023ae078d173306b9c3c65860cdf.