This reverts commit 1cfe9539f9. No longer needed after the upgrade in 095af3e63b.
1cfe9539f9
095af3e63b