Revert "Merge pull request #12966 from crh0716/909689"

This reverts commit 1f1fd614bb389e425b5d06ff92b68d35a87a2d41.