Revert "no need for recursion and a buffer if you know how things are supposed to work"

This reverts commit afa38a2512f08019c966209c2a88970a21c995b5.

Turns out there are some more terribly hacky things happening upon
initialization, so we punt
work around general hacks and get all tests passing