Revert "Sync"

This reverts commit 069017fd9b8ce4a639e1800e40780fec970694d3.
Revert "Revert "Sync""

This reverts commit 8e39bcce0aae774b9599c13511699090d3906fb7.