It took writing and debugging #15500 for me to understand what the issue with the old path was.. Much simpler alternative to #15500, or we could merge both but disable Split/Second for this one. Needs some benchmarks I guess...