Revert "Overhaul"

This reverts commit fd5e6c88d7679c413bcccd5c01fc3261775ab933.