Revert "Stuff (part 1)"

This reverts commit e3bf95ad3c06e12f8a1710672000db96c0ad05b3.