Revert "sync"

This reverts commit fcfe121fb6ce73f3c5b5d3a1926c5a1f53657110, reversing
changes made to 21ff89118b39a8723156a3687fa28c607175ed82.