Revert "This and That"

This reverts commit 29415a2856b3b1e8b59f2c9bb17a747c98a796e4.