Revert "Stuff (part 2)"

This reverts commit ccc32a502576f6a9abafe54b0d10f2d14e5a3d60.