I fixed this one way for our fork here. I'm not sure this is the most scalable way of supporting such functions though.