Revert "Makefile optimizations from Dennis and others"

This reverts commit 7e3c6d423a408684675bde2a5b690b21b101102c.
defconfig: update