Revert
This reverts commit a103875100b6ccaa85e8a984bc542c2cb2b7d7a3.

Conflicts:
	Makefile

Change-Id: I8da4556155f8f05a10e17162ca14eed3857e8cf1