This reverts commit 1cfe9539f99d4d0f9dd00a48f79d13e8a37b4d08. No longer needed after the upgrade in 095af3e63b26e4.