Revert "I did a bad thing, might have to revert this"

This reverts commit b9168c939c08dcbafdc763e9b806bf6d9c49d267.