Revert "Weird upstream stuff"

This reverts commit 7af0bdf25965bdfa6ab490575afdd49173d78b8c.