Revert "Did something really weird, trying to revert it"

This reverts commit 45d093a0cb315bac45ef94900e4ed0545afb0476.
la