I think we should probably remove this *but* double check to make sure the behaviour test those potential regressions (I think it should). WDYT?