Revert "Ditch the middleman shiz."

This reverts commit ce642e1fbc368a74f6ac6d95bb0fcffe7ba780bf.