Revert #7930

This reverts #7950 for #10162 .