Revert and make small changes