Revert "Trying to clean things up"

This reverts commit 19526fa4595e4cdd5027902539f48696b8762c17.