would be nice if we could upstream