Revert "23442"

This reverts commit 56f6b5a61bb8c8aec0a218912049126bcb9c7efe.