Revert "fixes for linaro 4.8.1"

This reverts commit a4d21cd094170478c59ddde77014c84fb7143952.