Revert LPS-45229