Revert "Comment out a couple of personal defuns"

If the changes get pulled, I'll delete the defuns

This reverts commit 5e4b8666924230560e433985967e695fdbe53133.