Revert introduction of _undelegate