This reverts commit 1cfe9539f9. No longer needed after the upgrade in 095af3e63b. (cherry picked from commit ab62b7e9b9)
1cfe9539f9
095af3e63b
ab62b7e9b9