Revert "Linaro 4.7 11-12"

This reverts commit 67b5db5ae4a3af60e922d65447f04b436c4b4953.