Revert LPS-34284