LPS-47984 simplify, the 'optimization' (it's not really) only makes the code more complex