This reverts commit 35f4087d6bbf97e52d1580a2d95a37a233262f52. Forgot to remove this from my list of upgrades.