Revert "Ugh..."

This reverts commit c854c13c7408a76f604c8f3a626787dea2f8be0b.