This reverts commit 9be5d2992c5002a464866180289abb470eb5f236. (cherry picked from commit 20291b178d72c4426705763e65a825419a7fc4c8)