Revert ECHO to a version that doesnt include a breakage

Specifically:
https://gerrit.wikimedia.org/r/#/c/115341/1