LPS-39901 Revert changes of LPS-30188 and rollback of LPS-34920