Revert "Linaro 4.8 attempt, failed"

This reverts commit a99bbe276fa3b2bb2320e68d158a28e5bf0c3bd1.