UAT revert and eliminate span