I fixed this particular thing in #3128.