I think the right thing to do is to simply remove it from BAT. I still hope that we gain some gvt tests.