Revert "Unbreaks things"

This reverts commit 4d91b6c49c90f9bb037bcdc1114eab5284f38e2c.