This reverts commit 3a0b69544183f71c4683bc477656473494fc09d0. (cherry picked from commit a888b5bc533bb91a3394f15a69879be1d7838592)