Revert "Sort out the golfing with the echo.t skipping"

This reverts commit db444ccefa4a40292f57d52faa46705cbaacebae.
Revert "Be explicit that we have no plan in echo.t"

This reverts commit 12d0dd5d30afd59db2cbb43f8d1bc0c7b2ad036b.