Revert "sync"

This reverts commit 097ec25b4b809dd7e0c0557ec701a1cdbba34232, reversing
changes made to 000fcee3d0b994482cf5877ac7a7d79c63f43c63.