This reverts commit 0064cba169d1bb761f6e81ee86830be598d7c500. (cherry picked from commit 3488c4f2c9767684eb1007bb00250f474c06d5d8)