Just a commit to diff mach ux500 stuff. Revert ASAP