Revert "Linaro fix test"

This reverts commit 32630fc0bd8abfa40bdb239a9927d42cbaa8e26d.