Revert "Some stuff, nothing works"

This reverts commit ce764ba340355abda28e7bf23ba31fadf9cd0e4e.