diff --git a/lib/src/io.dart b/lib/src/io.dart
index 93e096b9dfc51cf45c9fdb97b875342ddefa3c31..1990aa28c9e4ec7f6a40ca5d36c9ab0ce917d1fb 100644
--- a/lib/src/io.dart
+++ b/lib/src/io.dart
@@ -608,7 +608,7 @@ Future<String> consumeStringInputStream(StringInputStream stream) {
 /// Wrap an InputStream in a ListInputStream. This eagerly drains the [source]
 /// input stream. This is useful for spawned processes which will not exit until
 /// their output streams have been drained.
-/// TODO(rnystrom): Get rid of this once #7218 is fixed.
+/// TODO(rnystrom): We should use this logic anywhere we spawn a process.
 InputStream wrapInputStream(InputStream source) {
   var sink = new ListInputStream();
   pipeInputToInput(source, sink);
diff --git a/test/test_pub.dart b/test/test_pub.dart
index 61afc27b73c1eb5168a717b8244615d010a5a43e..846a21514b049b433b1ca1fccad0904f60516a6e 100644
--- a/test/test_pub.dart
+++ b/test/test_pub.dart
@@ -1468,7 +1468,7 @@ class ScheduledProcess {
 
   /// Wraps [source] and ensures it gets eagerly drained. We do this to make
   /// sure a process will exit even if we don't care about its output.
-  static Future<StringInputStream> _wrapStream(InputStream source) {
+  static StringInputStream _wrapStream(InputStream source) {
     return new StringInputStream(wrapInputStream(source));
   }