LPS-42515 Revert LPS-42359