Merge "Revert warning logic so it has a "don't show again" message." into nyc-dev