Revert "Sync with master"

This reverts commit 15e64ec3e92af9c1e23ef24dc13a08289f6d1240.