This reverts commit d5b84013. Running this through broader testing after rebasing is revealing a crash. Reverting while I investigate.