Update to new EH scheme.