Revert "Sync build"

This reverts commit 55a079479885f50d2b1c64e3330511bbeab7dadd.