Revert "#14958"

This reverts commit 53a06d0979290469186b1fe6bb66f3fb77b29ad7.