reversing some linaro-specific things