Revert to use setq instead of custom-set-variables.