I think this is way less performant than before.