Revert "More very magic stuff"

This reverts commit fae50eccdeae5e7c25f88d67e251d5db7d238f67.