LPS-48271 Revert d290b07ce1cb2a7f779c0d712744fddc67cbcbfe
LPS-48271 Revert 862772e5444ff359353324e9b14a61565c4f2b03
LPS-48271 Revert 8330a838ad407a95afc3d06ecb7cdba552cd149e