Revert "Merge remote-tracking branch 'origin/123' into wsq"

This reverts commit 59728adeaf27d0cfebd1cad8ae0c13438d80ca09.