Revert "This stuff never works and is super confusing"

This reverts commit ccfd24e720c2df19b692ce11a9afbdc8fc428747.