After sleeping on it that refactor was not the best of ideas.

This reverts commit 8fea372a8ec1f3ed5e38b7200c30182975f170ba.