rework what we actually do ship with the binary package (gah!)