This reverts commit 6a2a24f73728bc6f9f84ee86a9b9e55f990ab159, reversing changes made to e32b39f7dceeba4920507a916d6f6856d274c076.
(cherry picked from commit 2d0372bd1827949321901de7d997f5c88ee9cd9d)