This reverts commit dc32ab25a0. This has been causing panics, backing it out while figuring out what's up. Release Notes: - N/A
dc32ab25a0