Co-authored-by: Tan Long <tanloong@foxmail.com>
This reverts commit 62b3d2d443785c4ea5262edb4f9f7040440f9463, which broke buildbots