I'm concern about the perf implications here. Ideally, we should have a flag or something to trigger this behavior. /cc @ericf