Revert "Fix build for u8500 devices"

This reverts commit fb0cd21d236fb7d03215252f934a104db768c590.
Revert "Fix build for u8500 devices"

This reverts commit 40d3bebb99d37c8f80859808632c5aae795160c8.