LPS-36368 reverting one commit because it causes regression bug

Hi Brian,

I've realized that one of my commits caused a regression, thus I'm sending this revert. Sorry for that.

Thanks,

Máté

This reverts commit 8c9c3c5ec49a56bb0557afa245aada06390b35f2.