Revert "Utter Confuston"

This reverts commit 670a1e17ffeb1650f6a0d776e2d6d0b4091822b4.