Revert "That was a bad idea"

This reverts commit db296d9b44d5d974fb74628b68fce5dd7be88e30.