LPS-34094 Revert (reverse-merged from commit 33c2b92a744f603d01637f869f32ca107b79acea)