defconfig: Restore some things lost in e1f5ad233eaa92f54e525c370055456d93a1ca7a