Revert "defconfig: adjust to new version"

This reverts commit 662ee759fe6dec1cb5908ea22637c75014bfb86b.
[WIP] Merge into 3.0.31 - FIXES and CLEANUP