Revert "Did some thangs."

This reverts commit 09e2d36b7a29128df103263bb20a5e7d2576e678.
Reverting

Fixing the brokenness
Revert "Reverting"

This reverts commit 85a6240962d06b756217407cfab24e28f2352b1d.