Revert "Sync before merge sam's code"

This reverts commit a56c2fc090c2c28947fd5b706d5add93aa0b49b9.