Revert "I broke something"

This reverts commit d30f106356ef1e77bdbbece94e9d8d31158ea617.
Damage Control