Revert "Try something. Be ready to revert this if everything breaks."

This reverts commit c972738b5c8f8edea7d6641d60810123f567fac2.