Revert "Revert "Fix the things?!?!?!""

This reverts commit 54eb07bda0778ffba980d33bf6e51f47d8a90046.