Leave in device and kernel sources until dependencies fixed