LPS-42515 Revert changes of LPS-42359 because it creates regression