Avoid possibly inconsistent state
Merge branch 'use_proc_for_enable'