I'm trying to hack our one remaining Lift/war service to work with the new bundling, but it's troublesome