LPS-38340 Revert as it its breaking one test