Revert my refactor. Squimmy did it better.

This reverts commit 9cd8e23a.
2 jobs for master