revert: this change from linaro merge not needed by me

Change-Id: Iaadc6773619de88fa4090574ed5f029fc974dccb