Revert the part of commit 209daa20b2 (Code style: add missed explicit 'this->', 2021-01-05, v3.20.0-rc1~213^2) that updated third-party code.