Created by: luotao1

This reverts commit 652e804b. test=develop

Similar to https://github.com/PaddlePaddle/Paddle/pull/15872#issue-255267471