Revert "Just a commit to diff mach ux500 stuff. Revert ASAP"

This reverts commit 251326f29d7273ef6825d392f0af7a7a82304c5d.