Reverted Fix for Linaro build error