Revert "Continuation of commit 7461c119.  This needs to be further altered in"

This reverts commit bc7ea952b9126a5fb14e4804373f5819f057e354.

This ended up causing more issues than it solved, reverting.