Roll back 16364004 and 16206027.

sdk/bin/dartdoc

Index: sdk/bin/dartdoc
diff --git a/sdk/bin/dartdoc b/sdk/bin/dartdoc
index f95cb169787e281742dd27c579132710aeb99cb4..3f223678f655240fa886e78badda0250211bdfb8 100755
--- a/sdk/bin/dartdoc
+++ b/sdk/bin/dartdoc
@@ -18,17 +18,9 @@ if test -t 1; then
 fi
 
 unset SNAPSHOT
-
-SNAPSHOT="$BIN_DIR/snapshots/utils_wrapper.dart.snapshot"
-
-if test -f $SNAPSHOT; then
+if test -f "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"; then
   # TODO(ahe): Remove the following line when we are relatively sure it works.
-  echo Using snapshot $SNAPSHOT 1>&2
-  exec "$BIN_DIR"/dart --heap_growth_rate=32 \
-      "--package-root=$BIN_DIR/../packages/" $SNAPSHOT dartdoc $COLORS \
-      "--package-root=$BIN_DIR/../packages/" "--library-root=$BIN_DIR/.." "$@"
-else
-  exec "$BIN_DIR"/dart --heap_growth_rate=32 \
-      "--package-root=$BIN_DIR/../packages/" \
-      "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" $COLORS "$@"
+  echo Using snapshot "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot" 1>&2
+  SNAPSHOT="--use-script-snapshot=$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"
 fi
+exec "$BIN_DIR"/dart --heap_growth_rate=32 "--package-root=$BIN_DIR/../packages/" $SNAPSHOT "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" "--package-root=$BIN_DIR/../packages/" $COLORS "$@"