I think your new code has lost this optimization.