Patch moves to also use new ETS utility header