Issue #2284595 by Dan Chadwick: Fixed rebuilding new auto-saved draft with validation errors.