Revert "Change-Id: Idbbbcd8d00e88aecd1c043613f9da16fc67c54ba"

This reverts commit 282f64869d330f62fd8db0b55d99897cc89ac229.

Conflicts:
	config/common.mk