Remove propagateEHRegister in favour of a more limited