@rca, what is the 'price' of such LCL change? LCL breaks in other places?
Please apply this patch to the Git.