down to these test failures, which seem pretty intractable: https://gist.github.com/robmathews/54540c599d44a4c6aa68