Revert and fix for e-nets.