Separate enable and restart handlers.