This reverts commit efd34ba6. Reapplies 8ff48326. Missed a failing test. Needed to just update test checks.