And use it from CDB's module load/unload callbacks
instead of re-setting all modules. Some cleanup./Fixed
conflicts in 2.0
Acked-by: hjk