[Pushed to upstream] LPS-44098 Revert changes