Revert "git sync"

This reverts commit ce05f20afc04e946a754d634ec2c772a3376c71c.