hackfix to kinetic while we negotiate something better