Revert "linaro patch"

This reverts commit a03c8369d011dcb67fd44c87a9bfc42e00d3fe4c.