Revert maintenance changes