Revert "54645"

This reverts commit 89df2d0bc14d8ed10f8a25ab96bce811da2d865a.