Revert to avoid conflicts.