Remove extra complexity of six.u wrapper.