Revert "Changed this, that, and the other thing"

This reverts commit 69acde23d62fecfac9d5ecee667bc374cb56bc62.