This reverts commit 7adb8cbc0ea0bda539b4d1e9aaf9334bf965c8ec. Signed-off-by: Paul Elliott <paul.elliott@arm.com>