turns out some of those things that I maintainer-cleaned away were actually necessary