Revert "24346633"

This reverts commit a121c23b6d30d0a58f4142288a872330f406b793.