Revert XU3 hack to make U2 work again