Revert "sync changes"

This reverts commit 9fc1f59b90156b8ded11abf2bd831b9aa8ad099c.