Revert config.mk to upstream configuration