4g defconfig: revert some (baby steps)