@witty-crayon-22786: Are those APIs that we care about? Even a working patch that we could optionally consume as a forked sbt dep would be pretty great