Re-combine enable and restart to avoid double delay.