Lps 42295

Hey @laszlocsontos and @KocsisDaniel,

I undo and redo your fix.

LayoutLister is a very old legacy code, most parts of it are out of date and no one is using them any more.

We should do a clean up first, before optimization, otherwise the code will become almost impossible to understand in the future.

Please check out my change and make sure I did not break anything. I don't really have a way to test it.

And if you like, you can fix and readd your unit test back.

Please send this back to me if everything is right, I will push it up to Brian.

Thanks!