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

This reverts commit 97307196240d2f5dc1b8981df0eea0458ef56a25.