LPS-33899 Revert