Revert "Fix echo bug with cl.exe"

This reverts commit 2feb1180afe21bbc6453dd7a95fe53c2e25fbb55.

This didn't actually fix anything.