Revert "pre-resync commit"

This reverts commit ae60c4d5a8105b8a948cd7e456c687e0d663a910.