Checking in a patch that I believe fixes the kernel crash caused by the