This reverts commit 485542f317.
485542f317
I'm more of a basic kind of guy. This is easier to manage.