I think this will have a non-trivial perf impact, but hopefully it will get us out of this ivy thrashing hell