ESI include is off the waiting list.

Many thanks to Nils for pushing for us to fix this.

Superceedes #1902