Issue #2932071: Give more accurate feedback when skipping recovery codes