build: remove stupid hacks

Change-Id: If140c98a24805c6990cd2c83d2b95b75feb5da87