Revert "Same functionality, just a little cleaner"

This reverts commit f828e2d9399a6e1f6ff1165a57479f67f2c877cb.