LPS-37702 Revert as it is breaking the build