Revert "JustArchi optomisation fix"

This reverts commit aedb6de8afecfc82279c583ae5a04fd41281ebb6.
Fix build error with 4.8+ toolchains

Change-Id: I383fc880911b0aa1a48de18f97a2b85394636adb