Revert "cleanup"

This reverts commit 48bb01d7d09e97f203758c77c38f344b82a2c5fd.
Revert "cleanup"

This reverts commit 972fec1cd0bd1ec1188fa1b41f06f6cbae642897.

Conflicts:
	config/common.mk