This set of patches eliminates the dependency between the