Revert "Sync fork"

This reverts commit dee35c99398daad4e2496f0587f8dd0400cdcdf8.