FIXES NOTHING BUT BREAKS FURTHER: Revert "Revert "partial revert of 97ee411""

This reverts commit d67ed3304300afa49dd9484d0e54212f679cc75d.