Revert LPS-39137